Backport(v1.16): Fix #4396: Add timeout to establish_connection to prevent infinite loop (#5104) #5137
+33
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Same status with #5138 (comment)
|
Watson1978
force-pushed
the
backport-to-1.16/pr5104
branch
2 times, most recently
from
530c20a to
3e89308
Compare
Contributor
Author
|
Without this change, it appears to fail sometimes in the v1.16 branch as well.... |
…op (#5104) **Which issue(s) this PR fixes**: Fixes #4396 **What this PR does / why we need it**: Adds timeout mechanism to `establish_connection` method to prevent infinite loop when handshake protocol gets stuck. In unstable network environments with proxy components, if connection drops during handshake after TLS establishment, Fluentd gets stuck in infinite loop causing logs to stop being flushed. This fix uses existing `hard_timeout` configuration to break the loop, disable problematic nodes, and maintain log flow through healthy nodes. **Docs Changes**: None required - uses existing `hard_timeout` configuration parameter. **Release Note**: Fix infinite loop in out_forward handshake protocol that could cause logs to stop being flushed in unstable network environments. Signed-off-by: Ian Driver <[email protected]> Co-authored-by: Ian Driver <[email protected]> Signed-off-by: Shizuo Fujita <[email protected]>
Watson1978
force-pushed
the
backport-to-1.16/pr5104
branch
from
3e89308 to
5acd606
Compare
kenhys
approved these changes
Dec 5, 2025
Contributor
kenhys
left a comment
kenhys
left a comment
There was a problem hiding this comment.
For a last milestone of v1.16, it might be reasonable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #5104
Which issue(s) this PR fixes:
Fixes #4396
What this PR does / why we need it:
Adds timeout mechanism to
establish_connectionmethod to prevent infinite loop when handshake protocol gets stuck. In unstable network environments with proxy components, if connection drops during handshake after TLS establishment, Fluentd gets stuck in infinite loop causing logs to stop being flushed. This fix uses existinghard_timeoutconfiguration to break the loop, disable problematic nodes, and maintain log flow through healthy nodes.Docs Changes:
None required - uses existing
hard_timeoutconfiguration parameter.Release Note:
Fix infinite loop in out_forward handshake protocol that could cause logs to stop being flushed in unstable network environments.